minor cleanups and merges

diff --git a/NEWS b/NEWS
index 1a165c454e4fd747fe2b2a95761274a2651c302f..81bbfc6258f8abf7dafb01f6a641e80a33e407fc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,13 @@
 Overview of Changes in GTK+ 1.1.0:
 
-* Significant speedups to widget creation, destruction and signal emissions
+* Significant speedups to widget creation and destruction through caching
+  colormap and visual queries to the XServer.
+* Speedups for type creation and especially gtk_type_is_a() checks.
+* Speedups in signal lookup and creation and especaially with signal
+  emissions.
+* Minor speedups with object data allocation and destruction.  
+* Newly included file gtkfeatures.h which defines compatibility macros to
+  test for certain API features upon program compilation.  
 * New widget GtkCTree
 * Upgrade to libtool-1.2
 * Lots of bug fixes, including one that fixed a major memory leak

diff --git a/gtk.m4 b/gtk.m4
index 463c4367775b49f804d1e3b9117ccd2bab4e202f..44594bdd764867cc2720d08f6c90a19f16be4f9c 100644 (file)
--- a/gtk.m4
+++ b/gtk.m4
@@ -61,10 +61,13 @@ int
 main ()
 {
   int major, minor, micro;
+  char *tmp_version;
 
   system ("touch conf.gtktest");
 
-  if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_gtk_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
      printf("%s, bad version string\n", "$min_gtk_version");
      exit(1);
    }

diff --git a/gtk/gtkfeatures.h b/gtk/gtkfeatures.h
index deddc93c2de4cf056d9e2ec17243726ed8c06272..c4d051c56f1b126245eb2edb8e2b5646d50582d8 100644 (file)
--- a/gtk/gtkfeatures.h
+++ b/gtk/gtkfeatures.h
@@ -36,17 +36,19 @@ extern "C" {
  */
 #define GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS           1-0-1
 
-/* from now on we export the gtk_signal_init() function
+/* new macros for checking of class types
  */
-#define GTK_HAVE_SIGNAL_INIT                           1-1-0
-
-/* we have a new gtk_signal_emitv*() interface
- */
-#define GTK_HAVE_SIGNAL_EMITV                          1-1-0
+#define        GTK_HAVE_IS_CLASS                               1-1-0
 
-/* "signal-name" is now an alias for "signal_name"
+/* export the gtk_signal_init() function
+ * new gtk_signal_n_emissions*() functions
+ * "signal-name" is now an alias for "signal_name"
+ * new gtk_signal_emitv*() interface
  */
+#define GTK_HAVE_SIGNAL_INIT                           1-1-0
+#define        GTK_HAVE_N_EMISSIONS                            1-1-0
 #define GTK_HAVE_SIGNAL_LISP_SYNTAX                    1-1-0
+#define GTK_HAVE_SIGNAL_EMITV                          1-1-0
   
 
 

diff --git a/gtk/gtkfeatures.h.in b/gtk/gtkfeatures.h.in
index 684b6aa9de2629005c7a5173b43e00bcc7acfcd2..5c06eeb7d2755804d4ffe016b48152489deb5c8a 100644 (file)
--- a/gtk/gtkfeatures.h.in
+++ b/gtk/gtkfeatures.h.in
@@ -36,17 +36,19 @@ extern "C" {
  */
 #define GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS           1-0-1
 
-/* from now on we export the gtk_signal_init() function
+/* new macros for checking of class types
  */
-#define GTK_HAVE_SIGNAL_INIT                           1-1-0
-
-/* we have a new gtk_signal_emitv*() interface
- */
-#define GTK_HAVE_SIGNAL_EMITV                          1-1-0
+#define        GTK_HAVE_IS_CLASS                               1-1-0
 
-/* "signal-name" is now an alias for "signal_name"
+/* export the gtk_signal_init() function
+ * new gtk_signal_n_emissions*() functions
+ * "signal-name" is now an alias for "signal_name"
+ * new gtk_signal_emitv*() interface
  */
+#define GTK_HAVE_SIGNAL_INIT                           1-1-0
+#define        GTK_HAVE_N_EMISSIONS                            1-1-0
 #define GTK_HAVE_SIGNAL_LISP_SYNTAX                    1-1-0
+#define GTK_HAVE_SIGNAL_EMITV                          1-1-0
   
 
 

diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h
index 8c95f264da6b4cd3471d9b79bed1cea5a4222974..323b69fcab844582ca2fa135f472e3129cba737b 100644 (file)
--- a/gtk/gtkobject.h
+++ b/gtk/gtkobject.h
@@ -55,10 +55,10 @@ extern "C" {
 /* Determines whether `obj' and `klass' are a type of `otype'.
  */
 #define GTK_CHECK_TYPE(obj,otype)         ( \
-  GTK_TYPE_IS_A (((GtkObject*) (obj))->klass->type, (otype)) \
+  gtk_type_is_a (((GtkObject*) (obj))->klass->type, (otype)) \
 )
 #define GTK_CHECK_CLASS_TYPE(klass,otype)  ( \
-  GTK_TYPE_IS_A (((GtkObjectClass*) (klass))->type, (otype)) \
+  gtk_type_is_a (((GtkObjectClass*) (klass))->type, (otype)) \
 )
 
 /* Macro for casting a pointer to a GtkObject or GtkObjectClass pointer.